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

* changes:
  [automerge] Tradefed () 2p: d3eed48e97
  Tradefed ()