Merge "Remove noop try catch statements"