Merge "Make concurrently accessed globals atomic"
am: df4629e947

Change-Id: I8d1bb03d08919de06f6661287079f62b69aa8d73