Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da
am: 2c56bb54be

Change-Id: I94f71a7bca16e93085058b96389bd34e72eab8c8