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

Change-Id: I982707d42ff59124aa59213ed9d95df294a3650e


Trivial merge