Merge "tests: Remove {old,new}.file." am: 09ce7686f2 am: 14d87881d8
am: 0a32c73326

Change-Id: I2f5a77cca65eb244217ca7b7b37a5d4bf9f3c732