Merge changes from topic "cherrypicker-L07800000960236296:N91900001362511543" into udc-dev

* changes:
  [automerge] Refactors common scope id setup code into utility function 2p: f93a9ddc91
  Refactors common scope id setup code into utility function