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

Change-Id: I9e5e33115b6907b58f282d0337222b0302696e1e


Trivial merge