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

* commit '887a834c4737bed055bacbc91cc0dd42bd25546c':
  Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit.