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

Change-Id: I2da73f326300b5aff155f2ef498bac409ceaeeea