am 03e45da4: am 49beb7e0: Merge "property_service: Added vendor build properties to load_all_props"

* commit '03e45da4fee72c9ebe9416c36d8bc60a43ec028e':
  property_service: Added vendor build properties to load_all_props