Merge "Make assertFileContains not create files by default"