Merge "Remove inappropriate conversion of IOException to AssertionError"