Merge "Fix cases where we miss instrumentation changes" into nyc-dev