Merge "Save and Restore java.io.tmpDir Property" into ics-mr0