Merge "DO NOT MERGE: Change the order of 2 statements to remove race." into nyc-mr1-dev