Merge "Remove use of deprecated Exceptions"