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

Change-Id: Ibfd51487f4238a90227e29c2d37a9b87c499f8bf


Trivial merge