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

Change-Id: Id7671590c2baf1b5e0aec27c9056d86a5bcd05e9