Merge "Remove optimization to report config change" into nyc-dev