Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:10:13 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:10:13 +0000 (19:10 +0000)
am: baa7680368

Change-Id: I471754b1d44512e919618d404340ff52e83e0666


Trivial merge