Reenable MTP

Change-Id: I5c80daa4f831ede74a176245f2e6a8ae44133826