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

Change-Id: I9fa07add080b3336cbf539d406220c9906e0adfe