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

Change-Id: I8ed5d9ec1c12aae37b48fab47211a20b4b09b71c


Trivial merge