Merge "Ensure seq_cst memory ordering for num_contenders"
am: 58573cc806

Change-Id: I834fa6a1ad3e9ad5e33403c07903b0a2befe047c