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

Change-Id: I6d02e17f212b826c62ca711317450214b4a87e71


Trivial merge