Merge "Fix test-related build breakage."