Merge "Handle null assetFd like a FNF"