Merge "Fix an argument to the legacy broadcast"
am: b00786fe21

Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0