Merge "Fix testPasswordMinimumRestrictions"