Merge "Better handle MSIM DDS changed event" into oc-dev am: e44125cd3a  -s ours
am: 4b230aba33  -s ours

Change-Id: Iccec4126dbe952fb2cc74c068273084c454e5b85