am e89b6f5d: Merge "Update device to use set_prop() macro"

* commit 'e89b6f5df1b971c27ec85efb5dd41b9012930dcc':
  Update device to use set_prop() macro