am fc34b7b7: Merge "Remove accessibility as an optional feature" into klp-modular-dev

* commit 'fc34b7b7fc9749a3fb1f8e7d924274a5768366aa':
  Remove accessibility as an optional feature