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

Change-Id: I1ffdc1cf4f962ba44a2c774d885753362e380224