Merge "Fix broken handling of instrumentation lists." am: fb4b605612 am: 3322c61736
am: e9d72d8b35

* commit 'e9d72d8b35df54c53aff282e91ab9dcfa08bd9fa':
  Fix broken handling of instrumentation lists.