Merge "Opt-in VVM3 for OEMs" into nyc-mr1-dev