Merge "property_service: drop unused header" am: 1134925 am: b627a01
am: 2a651e6

* commit '2a651e603a945e8ae10ddddb889ee654779769bc':
  property_service: drop unused header

Change-Id: I7345729982ee9a1c45e2ae690f36a78619fa017c