Merge "Merge changes from topic "reiwa_o_cts" into oreo-cts-dev am: b90a406ee3" into oreo-mr1-cts-dev
am: 35a32100d9

Change-Id: I0293919eef881060ea1720853fb8b2b38d69a0d3