Merge "Revert "GITC: Always update the gitc manifest from the repo manifest""