am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev

* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
  Add hardware feature describing a watch.