am 9ba48cef: Merge "Fix the read barrier builds."

* commit '9ba48cef58e71f6a61b346d83c69c6372ede6b77':
  Fix the read barrier builds.