Merge "Add hardware feature describing a watch." into klp-modular-dev