Merge "Avoid direct use of QuasiAtomic by using Atomic."