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

* commit '49beb7e01be1c7a9914371fb6f8d2c9d76c46a7e':
  property_service: Added vendor build properties to load_all_props