am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.

* commit '00e37916bc121cea928f6bad6d059cbd00e8bf6b':
  Fix 3379239: Catch exceptions from workaround for OOM.