Merge "Adjust "services.core" defaults for Error Prone."