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

Change-Id: Ic9543265c1777380b344b7a9585dbb1ba07ec343


Trivial merge