This allows to handle the last segment retrieval and process the case where the filename is null in the method. PiperOrigin-RevId: 314512974
