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

Change-Id: I684ea8392d3980ffa083770a67c4249c21e6d4bc