am 05c3f7ce: am 53df3d67: am e89b6f5d: Merge "Update device to use set_prop() macro"

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