Merge "Remove mediaserver sysfs write permissions."