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

Change-Id: I9c336b20b449ba22fa94b3a61bbcb9bbec76e8d8


Trivial merge