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

Change-Id: I68024b8bdef40c8b46bbda06f94df58d227f8997