Merge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5 am: 769492af1d...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 20:49:32 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:49:32 +0000 (20:49 +0000)
am: 99151e6b0b

Change-Id: Ibf7a32b3b1badfb29283a0b42cc4023840ba977e


Trivial merge