Merge \\"DO NOT MERGE: Change the order of 2 statements to remove race.\\"...
Merge \\"DO NOT MERGE: Change the order of 2 statements to remove race.\\" into nyc-mr1-dev am: 45ae57ea
am: bcf1491c -s ours
Change-Id: Ieb58ddd7107634142058b70fc19e14ba5bac6b9f