Merge changes from topic "reiwa_o_cts" into oreo-cts-dev am: b90a406ee3 am: c7dfe6783c am: 67418293c6 am: 9692392424 am: 41703900eb am: 5a323ab7df
am: d41d6f611b

Change-Id: I5183f5eceaf16923175cb03a7c8f598663219f68