Merge "better defualt behaviour for msim" into oc-dev
am: 7358ebeedd

Change-Id: Id8fd96ae871c510972f70450224b5ab2e20f27da