Merge "Add support of directory copy" am: 6313143933
am: 6c11077d90

Change-Id: I710ba9dc07d87c8ba37675e93be1dd6180c1c84f