Merge "Merge "Use dev/null instead of tmp file" am: 2bd4dd2339 am: 7bb14d873c am: 42c7c8d356"