Merge "Fix MathRoundIntLong errorprone issue" into main