Merge changes from topic "am-fa4b48144a8b4d31a33a0c792d990acf"

* changes:
  [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-dev am: dd5160a2 -s ours am: fcd6a07c -s ours am: d76f695c -s ours am: beb3f33d -s ours
  [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8914ae87 -s ours am: 00437fe9 -s ours am: 631f718d -s ours am: 3da6dbaa -s ours