am 62ba4014: Merge "Fix the read barrier config build."

* commit '62ba40149be3d1c65e4db1f455822a585149d32f':
  Fix the read barrier config build.