Merge "better defualt behaviour for msim"
am: fd810d8727

Change-Id: I242527153b768879acd1c105e69de5672678b006