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

Change-Id: I23c8bf61feb69509d102c4a2d2e0e79d1d19de5e