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

* commit '860dc7e25d4ba64b5bd49fe123bae6e6105dd2e7':
  Fix implementation of generic atomic operations