am 1b1aea22: Merge "Fix x86_64 test failures."

* commit '1b1aea22c0cc5567b5967590cb3f949cc45c3a9a':
  Fix x86_64 test failures.