resolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6 am: cd63b8bc85
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:36:05 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:36:05 +0000 (18:36 +0000)
am: e713959f89

Change-Id: I2b1ca5f8b99ea1162fd71d0e729e377604086a9b


Trivial merge