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

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