Merge "better defualt behaviour for msim" am: fd810d8727 am: 6512f5eb10
am: 2113a60b56  -s ours

Change-Id: If1efb858a531eb1b6d88a151e3b1800605b8b778