Merge "Re-add MTP interface string"
am: 58cdf4a1ac

Change-Id: I1a9bbc97b06d355348549a47af7ebacea82207eb