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

Change-Id: I50907e813c211098054846237debca1520e5607e


Trivial merge