am 3a3b12c2: am 64f5fe27: Merge "property_service: get rid of hard coded property / control list"

* commit '3a3b12c2a1876eaa90615a473c330e1a4f5118f3':
  property_service: get rid of hard coded property / control list