Merge "Fix StrictMode I/O violations"