Merge changes from topic "reiwa_o_cts" into oreo-cts-dev am: b90a406ee3
am: c7dfe6783c

Change-Id: I261565ec04344a2ea05afa497b1f65f5223760bd