Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:18:45 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:18:45 +0000 (18:18 +0000)
am: b6d1e63153

Change-Id: I9c160f3986f13d7f9547b6d243c2b4ec1db1c157


Trivial merge