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

Change-Id: If7295c70aa688b388ba35efc4e170e843926ffb1