Merge "Fix legacy request removal." into lmp-mr1-dev