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

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