am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev

* commit '19f7cd5c635b295e3e15ca2129a1f24fe9df98ec':
  Remove some features from wearables