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

Change-Id: Ic422fdeacdab86ba3ee10aaa927471f5675db24d


Trivial merge