Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)
am: 5fdb13fc11

Change-Id: I600549327c2134e8e21728f7406b217566b925c5


Trivial merge