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

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