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

Change-Id: I399e9224f3c0db1b2c30218d04f21789cc53fad9
tree: 1e79175fea4a501c5aee36b7b4024d26af181a8c
  1. tests/