Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:03 +0000 (17:12 +0000)
am: 9eb945b2c3

Change-Id: I7ee71b88a41508adf514de850ea9237d26f77061


Trivial merge