Merge "Ensure that updates to the global event mask are atomic"
am: c3f35f2f00

Change-Id: I3613fce4c8e5beb1430f6b487c26b5ee471d451f