I think the "previous-engine-name" data handles the one previous engine only but we need to come back to any previous engines.
LGTM. Please update BUG= a full URL link before push this CL. Thanks.