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

Change-Id: Id15f3a2fff1eaee22c18bd5e5cbf9b30e54bfc6b


Trivial merge