Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:22:02 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:22:02 +0000 (18:22 +0000)
am: 77336cdec1

Change-Id: I6095be19548b9fe0b9a77ed01a6f6e173d9fe63d


Trivial merge