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

* commit '4b862563be2627864590be7dd071c1d0289a6f33':
  property_service: Added vendor build properties to load_all_props