Merge changes from topic "am-6a3c257b422f4d5ca010f2a9ba3a372e" into udc-dev

* changes:
  [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 9dad574d1a -s ours am: a6fce7e150 -s ours am: 780c568fd4 -s ours am: 2d3d1c97ef -s ours am: 46da8bd8dc -s ours
  [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -s ours am: 0983f6341f -s ours am: 65b1791b99 -s ours am: d8dc5c73b4 -s ours am: f04023e4e0 -s ours