Merge changes from topic "am-e29a3b6573184ae39b6967350f8ccb84"

* changes:
  Merge changes from topic "am-79b4f404bf834deeadc8bd86350f043f" into oreo-cts-dev am: 4db4ec9573
  DO NOT MERGE Add test for bug 62187433 am: 3a1486cc1b  -s ours am: 1dae5e1398  -s ours