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

Change-Id: I4c2a49e924b8423bb01553e6127689bbfda26fdd


Trivial merge