Merge "Convert to sysprop as API"