am 5b2b9d6b: am b12d6055: Merge "Fix two read barrier bugs introduced in CL 97882."

* commit '5b2b9d6b672bce67763a9481f34ad5fd83216ee4':
  Fix two read barrier bugs introduced in CL 97882.