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

mentioned in commit c4818458

mentioned in commit 1ea21b3b

mentioned in commit 671eee38

mentioned in commit 21293b87

mentioned in commit bacb3235

mentioned in commit af8d457d

mentioned in commit e661c4ed

mentioned in commit 952ee3d6

mentioned in commit 7d270c63

mentioned in commit 7cf8e5d4

mentioned in commit 1780c25d