Merge "Simplify throw statements"