Merge "changetags: Remove unnecessary semicolon after catch block"