am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev

* commit '64c496c8d51c71605cd34a510da2ecd8180656ec':
  Fix MTP delete