Merge "Move some properties to system_vendor_config_prop"