am 10bd97f0: Merge "Split multicatch so they have different handlers."

* commit '10bd97f0dd9a521d0bf681b6922f7d0657977d26':
  Split multicatch so they have different handlers.