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

Change-Id: I07d67905e18b495be423208a89cc4ff46aa10711