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

Change-Id: Iffe7d3e208e0df346a47c256ed611b5de71081e2