Ensure that MTP is enabled by default

Change-Id: Ibd644509935cde1e52b3d368060fdcb6e16f4a99