Merge "Refactored unnecessary calls to updateRulesForGlobalChangeLocked()." into nyc-mr1-dev