[automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev
am: 27f23459d2 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1 807983b976 is in history

Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0