[odbol]

My HTC One M8 lets me choose between mounting as a drive, MTP, or just charging. Maybe that's a general Marshmallow feature but it's great.