Merge "Debug: Use UniqueFile"
am: 546f755bf8

Change-Id: I8696c83ddc9dbde46933810219f443dafa4b9d67