Merge "Revert "Delay init of classes of pre-allocated exceptions.""
am: a98d9e76ed

Change-Id: I51506511cc5079af1bcefbd974a6db35dcdf9371