Merge "Tentative fix for build breakage with read barriers." am: 41bcd81
am: 9136bb2

* commit '9136bb20ce7bb8bdd283177390483fb47d0c669c':
  Tentative fix for build breakage with read barriers.