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

Change-Id: I202b9be2b529cc3ba80a96f66a31b42252b47234


Trivial merge