Merge "Fix x86_64 test failures."