Merge changes I42e7cc34,I83d9a25f into oreo-cts-dev am: bb3bdb57 am: f655ff4c am: f4250160 am: f6273f59 Change-Id: I41b85d7beeffa63358b0afced4980c160a8ba372