Merge "Change tests to use a temporary dir for files."
am: 04b83d8ec2

Change-Id: I42a8fa0f72686eab6e57c6c2090836d1a4525f65