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

* commit '3322c617368874c852050910ba9683ef1464c5b3':
  Fix broken handling of instrumentation lists.