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

Change-Id: I11262e4de0cc8676497f8bf8b86281a78df7a3a0