Merge "property_service: Added vendor build properties to load_all_props"