Merge "Fix VVM Activation" into nyc-mr1-dev am: 95324e95cf
am: 2e0c58bb2a

Change-Id: Ib445e6f5773034d977c8500c4a78e65f6c6aa7c4