Merge "Make concurrently accessed globals atomic" am: df4629e947
am: 851c97cb39

Change-Id: Ic922ddfc1510c348083c62ffb612dd60179fe19a