Merge "Rename tmp files" into rvc-dev am: d982cfb6bc am: 1f3c2cca4d

Change-Id: I36a5a00f60e2e21edfe5d5d10d79181098d6f8cf