Merge "Catch Throwable instead of Exception." into oc-dev
am: fff08f9ad3

Change-Id: Icfeb980db876fe2c73f86e4982429b6b94bfc08a