am 3a0d4b34: Merge "property_service: better validate property names" into klp-dev

* commit '3a0d4b34816d65e21951f44e4d98a954c5c855ae':
  property_service: better validate property names