[automerger skipped] Merge "send default sub change broadcast in multisim mode" am: 81d664d1
am: 72f91b3d -s ours
am skip reason: change_id I43ab6eef514141b9cdaf7c324bc8fda08ff0657f with SHA1 3db071e5 is in history
Change-Id: I080c7c92ee04f0e2b8fa5c0622043e1198c06016