Add missing Barriers in ReplaceReferences
am: a142f712df

Change-Id: I768bff727b6ce9bbba5d5e5757dcb028116884fd