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

Change-Id: I623079e128011c74a744d99f99e1a93ea4c0cad5