Merge "Fix implementation of volatile stores" into honeycomb