replace password1 and password2 with password and confirmedPassword

Change-Id: I929df5486f8e75af060ed2195c3460e60f08d06b