Merge \\"Wrap certain exception types when loading an erroneous class.\\" am: 923b26fb78
am: 0497ba215a

Change-Id: Ice3b8d61131ca0dd214dace63e6123cda469ecb6