Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:57:05 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:57:05 +0000 (17:57 +0000)
am: c7295524be

Change-Id: Ie99e239159617ea101d5658d1d020f23822fc823


Trivial merge