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

Change-Id: Icf1817c1762458521800bc93f04af2a2c94d4e70