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

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