Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb