Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)
am: ffc44cfca7

Change-Id: I1a27a9a985eac26d8db649413ad396551f5323d1


Trivial merge