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

Change-Id: I6fa753959e98422ce7ae68a9e2bc01b0cc162d5d