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

* commit '386ef6da5a95243b4a55b3f760621260e20a5e39':
  Fix another barrier bug 3333866 Atomically update put.