Merge "Remove (un)mount option for datamedia partitions" into cm-10.1