Merge changes I42e7cc34,I83d9a25f into oreo-cts-dev am: bb3bdb57a1

Change-Id: Iee0a83c949fd935288f98d0373746f5a4469bb33