Merge "Remove intermediate build rule that requires checked-in config file to be up to date" into main