Cherry-pick change after repo init if core manifest is changed