Merge "Fix multiple bugs in EncryptedPassword"