am 28d0d868: am 323df093: Merge "property_service: Added vendor build...
am 28d0d868: am 323df093: Merge "property_service: Added vendor build properties to load_all_props" into lmp-mr1-dev
* commit '28d0d868':
property_service: Added vendor build properties to load_all_props