Merge "Fix BoxedPrimitiveEquality errorprone issue" into main