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

Change-Id: I57e016f4879b8e61e615cc219becb538e650db0b