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

* commit '33045b3d7bd965f67e2e0b175976cf9934fb924f':
  init: harden property service.