Merge \\\"Wrap certain exception types when loading an erroneous class.\\\" am: 923b26fb am: 0497ba21 am: 0549d73d Change-Id: Ibe95b99df2c0fc66b13ec766df67b4b35796ccba