Merge changes from topic "presubmit-am-e78f08e08e08405dbecbcc11c69b1ee2" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Add more tracing 2p: 48309cc755
  Add more tracing