Merge "Re-add MTP interface string" am: 58cdf4a1ac am: b804854648 am: 7e8b1663fc
am: ff9f01d3ba

Change-Id: Ic2ac2f8e176d21e1e70f880af20958550a1c6008