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

Change-Id: I94362432212d7f0269f48ef0a45d1e960eef4b8c