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

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