am 61ed6e5e: Merge "Fix implementation of volatile stores" into honeycomb

* commit '61ed6e5ead6361a0589fee6bd42c56e44e3fd52c':
  Fix implementation of volatile stores