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

* commit 'dd6558da4bbd11a430268bff7d886b7fcb071dc4':
  Fix cases where we miss instrumentation changes