Merge "Disabled debug logs" into nyc-dev