Merge "Better handle MSIM DDS changed event" am: 4418eb4ddf
am: 8a3f025d71

Change-Id: Ib5c64fdc6bdb456c811e374c910bcc595e554b1b