Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 am: aa425927d0...
authorBrian Anderson <brianderson@google.com>
Tue, 7 Nov 2017 20:11:16 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Nov 2017 20:11:16 +0000 (20:11 +0000)
am: f784e5b4b1

Change-Id: I942554e6ed24b30a343a6f8fd142caf42bb5fc95


Trivial merge