Remove accidental double try-catch from 76800b47

Change-Id: I99b2a06342c096b6284af6e2bdec3fa8f008f857
Merge "Remove accidental double try-catch from 76800b47"