Merge "Fix test breakage."