Merge "Fix 4993068: Don't check password history when dpm sets the password"