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

Change-Id: Ifbdc49ecd23236f54aadb80701e48c13536166b9