Merge "Bug 3438513 Fix incorrect throws clause"