am ac79f4dc: Merge "Tidy up memory barriers."

* commit 'ac79f4dcaa0402f5d102bbdb7da938faea372d2e':
  Tidy up memory barriers.