am df5d4482: Merge "Clean up property service initialization."

* commit 'df5d4482074fc68a25a6a33992f3fc5164c2d3ec':
  Clean up property service initialization.