Merge "Mark entry in onEntryRemoved as @Nullable"