Just trying to keep /tmp clean

Change-Id: Ia8d7cf37a4f6a4652cb3440a896cefb411cdb41a
Merge "Just trying to keep /tmp clean"