am 0f29aec5: Merge "Simplify password checking logic"

* commit '0f29aec5af81083a558eeae7ec348b4f4fa9fb0e':
  Simplify password checking logic