Merge "Support new user setup for VVM3" into nyc-mr1-dev