resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:15:46 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:15:46 +0000 (19:15 +0000)
am: 93119248d0

Change-Id: I79d317d122e5b9f7d1dea940ae7db4f940018d1d


Trivial merge