Merge "Remove file added after bad cherry pick."