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