Fix MTP and PTP : Thanks Mark376

Change-Id: I35e762e246063c761fb584855375f6ad7554685b