Merge "Use dev/null instead of tmp file"
am: 2bd4dd2339

Change-Id: I2914c8189f6693c855e6fa02aec4c6ce3b6f190f