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

Change-Id: Idd8eecc29a019dc351660b5e2e882d5a8341ceba


Trivial merge