Merge "Fix SyntheticPasswordTests"