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

Change-Id: I355455e32e9f30922c4cd8f4966b50eb308aab5e


Trivial merge