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

Change-Id: Iaa554a2995f23acf71f7606d0ddf00cb8fc44c26


Trivial merge