Merge changes from topic "topic_sc-dev" into sc-mainline-prod

* changes:
  [automerge] Tradefed (Tiramisu) 2p: 9a0657c140
  Tradefed (Tiramisu)