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

* commit 'a9fbcf1a6a9d508501fc8a74a9d1ed49df0b1216':
  Fix the read barrier config build.