Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev
am: a2da20d334

Change-Id: Icf4936922afa7d5fd8cf309a5205b3dd6bfe95cc