PR 2368 rebased
Created by: myronmarston
This is #2368 rebased so the build will hopefully go green, and then we can merge.
/cc @xaviershay @JonRowe
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
This is #2368 rebased so the build will hopefully go green, and then we can merge.
/cc @xaviershay @JonRowe