Merge "WriterTest: remove output file after test completes" am: a6144f5e9f am: 4f8ef5892b am: 2a4b6db18c am: 9d0d8a2211 am: 0212e97e7d

Change-Id: I01d12a1843eda79ee96d1135006c4ef8b33b29cd