Merge "Merge "Only construct real Throwable objects." into oc-dev am: 08685337 am: f0278f30 am: 2c56bb54" into oc-mr1-dev-plus-aosp