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

Change-Id: I28dd793507e67fe16d74cac5bbc853102cfef083


Trivial merge