Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:05:04 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:05:04 +0000 (19:05 +0000)
am: 8c889579e3

Change-Id: I0821549683c6ee00467742304abb0e2be3f5f5da


Trivial merge