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

Change-Id: Ia0389940de05500e97c216e8e2744940215be841