Merge changes I52073eb1,I144cd37a into oreo-cts-dev am: f7cb6d1c54 am: 05f6a3b6a8
am: 4ca1ed3f14  -s ours

Change-Id: Ia3a9940a3340b976f523632437be24e285a1ecc3