Merge "Remove references to hardcoded file writing in /tmp"