Merge "[incremental] use same sysfs name for setOptions" into sc-dev