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

* changes:
  [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed -s ours am: 9dad574d -s ours am: a6fce7e1 -s ours am: 780c568f -s ours am: 2d3d1c97 -s ours am: 46da8bd8 -s ours
  [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf199 -s ours am: 3261dee3 -s ours am: 0983f634 -s ours am: 65b1791b -s ours am: d8dc5c73 -s ours am: f04023e4 -s ours