Merge "Fix 'repo cherry-pick' to avoid hanging on commit-msg update."