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

Change-Id: Ie21d50116ab96ac30408237503dd0829f634509d


Trivial merge