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

* commit '6dfa4188d5cbe7cb1c89011cda80e1c261ae30f0':
  Avoid direct use of QuasiAtomic by using Atomic.