Merge "Support new user setup for VVM3" into nyc-mr1-dev am: 493bca3e10
am: 4bc7929539

* commit '4bc792953948980af3a34e67f5d4b823962bf55c':
  Support new user setup for VVM3

Change-Id: I66f40aeac11c7a4755e3b405179539f26c0c4b2c