Merge "Fix a NPE when shutting down instrumentation" into mnc-dev