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