Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into sc-mainline-prod

* changes:
  [automerge] Enforce ComponentName belongs to caller app 2p: b479180b73
  Enforce ComponentName belongs to caller app