am 2088c1ad: Merge "Fix 2579481: Fix change alphanumeric password security hole" into froyo

Merge commit '2088c1ada1f1997e7f363a5897dfc26b3635c80e' into kraken

* commit '2088c1ada1f1997e7f363a5897dfc26b3635c80e':
  Fix 2579481: Fix change alphanumeric password security hole