Conflicts occurred during a cherry-pick and the revert failed. Manual
corrections were attempted.