Merge "Remove redundant genrules" into main