Merge "Allow folders to be copied into Downloads." into oc-dev am: b083198092
am: 4cf425683e

Change-Id: I0f67beda9e0ff864fa129214a32ae50ed99be5c9