resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47 am: 931192...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:23:19 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:23:19 +0000 (18:23 +0000)
am: 9e62d162fc

Change-Id: I214da293c66f68b23f595ddf75aa7e51107371b8


Trivial merge