Merge "DPM: Deprecate password quality-related methods"