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

Change-Id: I3f131e6f00e8744bbcef3f55fab6dd6086d77ff6