Fix MTP

Change-Id: I7764a20051e921c07265b8f6b02c58a729c9678c