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

Change-Id: I6fac18c8ba18f387b9b864055985b2a6bd12de68