Fix conflicts for !11396 while picking in 9.2 stable
Summary
This MR is to resolve conflicts that !11396 (merged) ran into while being picked into %9.2
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This MR is to resolve conflicts that !11396 (merged) ran into while being picked into %9.2