Merge "Merge "Remove copy to user dir. This does not work for secondary users." into pie-cts-dev am: 4a88bf8e30"
am: b528c6690e

Change-Id: I0efed0f5cebd224c5c716ed91daf363bbfe63e4d