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

* commit '144c4ff08a0be40e6b8af1bca269b33557923d71':
  Fix a NPE when shutting down instrumentation