am f9c05970: Merge "init: harden property service."

* commit 'f9c059700ce91dfca05d44ec67938209a69bbd39':
  init: harden property service.