Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev