Merge "Revert^2 "Delay init of classes of pre-allocated exceptions.""