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

* commit 'd1c6dca6219099ca73df04a65cc4e62b2d8102f6':
  Fix a NPE when shutting down instrumentation