Merge "Fix some nullability annotations on Map.Entry."