Merge "Fix errorprone build"