am 7661e875: am 6dfa4188: Merge "Avoid direct use of QuasiAtomic by using Atomic."

* commit '7661e87586685dc6246e504da7a959c006020467':
  Avoid direct use of QuasiAtomic by using Atomic.