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

Change-Id: I753177f01b99e7898d95fca379dbbacf65fa692a