Merge "configs: correctly add system property"