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

Change-Id: Ib9576615116b97588d6960448ef0f986bad651a3