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

Change-Id: I5623468a2c31d7e265e89f5d860e61fe911e225b


Trivial merge