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

* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
  Fix legacy request removal.