am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev

* commit '4cb113ed72b771d3148c00a025eb8bc949ff6a41':
  Fix a NPE when shutting down instrumentation