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

* commit '493bca3e102430aa8cfb3bf4c12dcc288c492a98':
  Support new user setup for VVM3

Change-Id: I7d52d649150b3486ae978d5c8f05764482f63ae5