Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev
authorBrian Anderson <brianderson@google.com>
Tue, 7 Nov 2017 21:24:40 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Nov 2017 21:24:40 +0000 (21:24 +0000)
am: 67694b5635  -s ours

Change-Id: Iab0ab07eeedaf7f009610b79874d168e7a81eb53


Trivial merge