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

Change-Id: I76b959b6c070d20c1f1564e3e0d99175b200b736