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

Change-Id: I4dd81db0bf1123030a372f72dacc1f09ec695272


Trivial merge