Merge remote-tracking branch oreo-mr1-cts-dev into master.
authorXin Li <delphij@google.com>
Fri, 5 Jan 2018 00:28:03 +0000 (00:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Jan 2018 00:28:03 +0000 (00:28 +0000)
am: 5ea85b4a84

Change-Id: Icf5146122985c65678f7ae1181272a1942b33b6f


Trivial merge