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

Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329