Merge "Fix file transfer corner cases." into oc-dev am: 922669e81c
am: aef8eb866d

Change-Id: I5a838ba9fdbc481674eb4c6638d1221a7027f205