Merge "Mount ptp separately from mtp" into pi-dev am: ff400ec976 am: 6a5b21be3a
am: 87ac96899a

Change-Id: I463890545871eb375594afbff3451c279ca46af4