Merge "Don't preserve file attributes when pulling bugreport file..."
am: 8570d1db70

Change-Id: I5ef7737f08462af3b572d4995ee59dfe0ec2d51b