Merge "Update enable/disable code to reduce flakiness" into nyc-mr1-dev