Merge "Revert "Errorprone: Temporarily downgrade error""