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

Change-Id: Ic518d88a1f22467db42280bcc5e0fc7d413e6c61


Trivial merge