Merge "Account for folders in copy and move."
am: fa7b99dd9c

Change-Id: I55f333c2237e97ea0ca38d296d6285d09d673197