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

Change-Id: I88322af4478278d1fbd21976290ae4d9be1b8b8b