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

Change-Id: I2c3b0de4274fec145330ef16176f3d6ac0aa6723