Merge "Fix VVM Activation" into nyc-mr1-dev