Merge "Ensure seq_cst memory ordering for num_contenders" am: 58573cc8 am: 365cfdee am: cabfe4c5 am: b1615102 Change-Id: I6e1a50153699ad66ce606c12edd1354fa296a2ee