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

* commit '474cb0e33aa12f7ba11170ad1a6b564bde244151':
  init: harden property service.