Merge "Add tests for the legacy broadcast" am: 99ef62827b
am: 6951ffb13c

Change-Id: I1d4365b5f092d2f1fed3117e40d64a26244b940a