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

Change-Id: I463700034a673d0a81d93c8072eba4fa99d30523


Trivial merge