Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 20:48:29 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:48:29 +0000 (20:48 +0000)
am: e7d7588724

Change-Id: I41ece2970c2b3411b915634be2f58f7330d3ffd2


Trivial merge