Merge "Merge "Catch Throwable instead of Exception." into oc-dev am: fff08f9ad3 am: cd62622f6d" into oc-dr1-dev-plus-aosp