Use retire fence

Change-Id: I47d3bcbe850c76a8c65fa21a9f1a34c016ed1c9c