Modifications to fix wifi and MTP.

Change-Id: Iaad8cb666d3ee38cfa3614b21bc256770c677d7f