am bff40697: am addf7a96: Merge "init: Let property_get return std::string."

* commit 'bff406978aad1a599d01f539d0a9b5718aaceca3':
  init: Let property_get return std::string.