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

Change-Id: I8a8d186e7c46e5721ca456a58f037dd31503f43d