[v10.x backport] backport d48bd16 from v8 master
Checklist
-
make -j4 test(UNIX), orvcbuild test(Windows) passes -
tests and/or benchmarks are included -
documentation is changed or added -
commit message follows commit guidelines
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
make -j4 test (UNIX), or vcbuild test (Windows) passes