Merge changes from topic "reiwa_o_mr1_cts" into oreo-mr1-cts-dev
am: 6934436353

Change-Id: I2c5d340906ede2daafe87a9a8e8b213520bcd572