Merge "Fix the read barrier config build."