Merge "Mount ptp separately from mtp" into pi-dev
am: ff400ec976

Change-Id: Ifa7577d82eb1ec408afdc0c441d5a7672c1f8cb8