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

Change-Id: Id605eff4586828c5cda33a80d0e4f5d78cf79a8a