Merge "Fix MTP delete" into lmp-mr1-dev