Merge "Don't use hard-coded tmp path"