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

Change-Id: I3cbdb8509a69b6835cb76cddde23c4b8ae7d2ecd