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

Change-Id: Icf55eb2474f82b6926f2392fa9cea0b126b83def
tree: 3e691d837288c614f132f5f6a658f1334dd237b4
  1. tests/