Merge changes from topic "am-08d0df54275d4be69bd77cdf4d6f7551" into udc-dev

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e am: 00254f69 -s ours am: 27502189 -s ours am: 18380d2e -s ours am: 168a08d9 -s ours am: 0c702a76 -s ours am: db20f16f -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a am: fcb0f9a6 -s ours am: bc8c22c9 -s ours am: b79c9322 -s ours am: 5df48205 -s ours am: f94885ec -s ours am: 720de845 -s ours