Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev