Merge "Disable MWI suppression if VVM cannot be activated" into nyc-mr1-dev am: 5f192c76c7 am: 261f47f9c2
am: 862451a83f

Change-Id: Ib56d938395588472502f4fee3983898407c0bfe9