Merge "Refactor password metric computation."