Fix MTP

Change-Id: Ifccf18b07de4560e514b440f157607fe69202c15