Merge "Better handle MSIM DDS changed event" am: 4418eb4ddf am: 8a3f025d71 am: 71f70d6685
am: 2a711c3c50

Change-Id: I68cd04f288f2d7006a2c55cba3584fd74117a1b8