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

Change-Id: I62d7899969aa8fcc1d5c8e566fb41825fd85e8ee