Merge "Update sysprop usages" into sc-dev