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

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