Merge "Fix MWI missing on blocked VVM3 SIM" into nyc-mr1-dev
am: dc80476522

Change-Id: I00c4932c5180e126971dab1dbb3432d510c497b4