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

Change-Id: I830179c5f8a5cb57b28fcfd27f09fb5b6b522352


Trivial merge