Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: a69387d887...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:15:24 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:15:24 +0000 (20:15 +0000)
am: 3830218b68

Change-Id: I2a20446f07adb9335bdc0a125e77d6f7133eda00


Trivial merge