Make concurrently accessed globals atomic
am: 33a4cc7bdd

Change-Id: Iafc7a22b9e9a9811f9006a8562c44bb182a5d15c