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

Change-Id: I63638f6b6e7af34645c210aa5eade81b348b28ee


Trivial merge