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

Change-Id: I3e283d7dfa29b42902c7470ca3489593ef7f7e25