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

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