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

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