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

* commit 'a79ac472d71de6d13f3561012ca0e870bd9fe04b':
  Add hardware feature describing a watch.