Merge "Schedule delete for files as soon as they are written" into rvc-dev am: 77c74c8227 am: 73bdcc2a74

Change-Id: I15b5d0fb784f9492e3cd518b29e3b4df7609aa88