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

Change-Id: Ie0f1f709b1ea5e928defdabac683558f2e7a13cc