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

Change-Id: Ia7cd363c31ff456071872dd30d2b9ffb1ebc7941