Need to revert the whole try/catch CL until issues are fixed. This reverts commit a65930de. Change-Id: Idd69215c87230a8616923665a55fe81891c78bec