Merge "Password: replace equals() with verify()"