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

Change-Id: I4a353896ae1d58cfa206c37b4081010f7577899b


Trivial merge