Merge "[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: e929052d83 -s ours am: 4ecbabc9a3 -s ours am: ef7e395138 -s ours am: 1a860bc6e3 -s ours am: 55592f1b5b -s ours" into udc-dev