am 323df093: Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev

* commit '323df093c842e17b69d2be02462053697ef4d92e':
  property_service: Added vendor build properties to load_all_props