am 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb

* commit '3e232f1c59eb95a7d3b5b3ea411a383b7a8f1b5b':
  Fix another barrier bug 3333866 Atomically update put.