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

* commit '3007cc30f224f560081091159c6f706b2ed0e4bc':
  Fix a NPE when shutting down instrumentation