Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am: fbb48bcecd

Change-Id: I7a1c9a20e5f4f9f051926294650fcf9d486d4703