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

* commit '52e5e55cac4e630e4eac59c387815aa307194540':
  Clean up property service initialization.