Merge changes I52073eb1,I144cd37a into oreo-cts-dev am: f7cb6d1c54
am: 05f6a3b6a8

Change-Id: Ifab3a44691c5facca1740a0970da26ac49fb02c1