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

Change-Id: Ic75ec3d48d7a035812937646da9725b98c8ae5cd