Merge "Move PasswordError under includes/password/ file"