Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Use volatile and AtomicIntegers to be thread safe Change-Id: I7183e546b46e17530024cf4368edbd1d32216549