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

Change-Id: I27b4fa6e9612439821d891516a761f3f819217d6


Trivial merge