am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev

* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
  Check feature bits before loading optional services