Merge branch 'ls/p4-empty-file-on-lfs'