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

* commit '41bcd81aebfb48cb848c84bc40f241a18c376af3':
  Tentative fix for build breakage with read barriers.