Merge "Change the default parameter values in common.MakeTempFile()." am: cc63bc3a91 am: 2b7a043a06
am: a21cff6280

Change-Id: I048ca3c7b4bcd5fa24cb1b7b903ebb60cc7fac47