Merge "Fix compiler bug when typing exceptions." am: 5098ab9245
am: 957dcd8711

Change-Id: I82d57526d72a428a2a37ad6f298077084f86eb75