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

* commit '0a4f0be2aaf697ca4b0938b31fc19bb007e87d0d':
  Clean up property service initialization.