Merge "[IncrementalService] use sysfs_name in mount options and dumpsys" into sc-dev