Merge "Don\'t allow userID changes on upgrade" into nyc-dev
am: 42cf25f

* commit '42cf25f735d0984e908bc30a948c631b39f2fd42':
  Don't allow userID changes on upgrade

Change-Id: I302f5dce4fd52d93f07b8e22bd9cd889ad41742e