am 82831c3d: am 4b862563: Merge "property_service: Added vendor build properties to load_all_props"

* commit '82831c3d26e5b38bd24bbd241dac40e09fd9ba4b':
  property_service: Added vendor build properties to load_all_props