Merge "Fix 2673731: Added password history"