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

Change-Id: I7ad8c5bc17e9929b25553b647239873f4a2d25a3