Merge "Debug: Use UniqueFile" am: 546f755bf8
am: 8d151b26c2

Change-Id: Idd34de736fb73a07bc8b2f9c37ecf3b2080f1512