Merge "Remove disabling of errorprone checks for stubs"