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

Change-Id: Icd3e105143930006d4e249b375046f3c06a8ab72