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

Change-Id: I1b6ae4d6dd4404890c37965149906fa184e1a1cd