Merge "Demote ComparableType errorprone warning" into main