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

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-v2-dev am: bfbbf359 -s ours am: b69f509f -s ours am: 9c712c62 -s ours am: 8552c7c0 -s ours am: afe55734 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: 50c9d488 -s ours am: 6cfc4b74 -s ours am: c89ad66b -s ours am: faec4237 -s ours am: a3829666 -s ours