Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Wed, 21 Dec 2016 23:18:30 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 23:18:30 +0000 (23:18 +0000)
am: 4045968a8e

Change-Id: Iaf0bdea3563c785d7b70178784941298a817c535


Trivial merge