Merge "Re-submit "Add genrules for merged removed.txt files""