Merge "better defualt behaviour for msim" am: fd810d8727
am: 6512f5eb10

Change-Id: Iedf27158b48f606a1f24e8780f98c3399e3337c7