Add missing Barriers in ReplaceReferences am: a142f712df
am: 59cacdd788

Change-Id: I519991b60a2d01d20f40bc70c44b34ecfa4cd5f5