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

Change-Id: I55cac364221c728ad1c77be783c358e8d98ec2b4