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

Change-Id: I0cb6261e655df6a06fdc00c8120a733cc395b95d


Trivial merge