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

Change-Id: Ia669fe57bd54b6a6dd233f00e3501ee5e8864826


Trivial merge