am c98e2365: Merge "Fix implementation of generic atomic operations"

* commit 'c98e2365cdd0c2330711118b689171df143f6399':
  Fix implementation of generic atomic operations