Merge "Add numerous missing @throws to method documentation"