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

Change-Id: I66df11cc48ca8bda0a0f828bc39a8ed364511976


Trivial merge