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

Change-Id: I37df8b69caa8db76c4568e762c49482602f38648