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

Change-Id: I6d820dbbfc7150c6b980a476e925a79639c62992