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

* commit 'b453a9aa1d6f0b2ac624583938202983ad25673b':
  property_service: better validate property names