Merge "Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit." into honeycomb