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

Change-Id: Ifc56e73f7eeaa22d8f16fcd50083f0b0fa37dc95