Ensure we track files created so that they can get removed automatically.

Change-Id: I0dd648af7d123f61fd1917c1a113016eb20f2ff1
Merge "Ensure we track files created so that they can get removed automatically." into stable/grizzly