Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev