Merge "Change use of /data to /data/local/tmp."