am b12e199e: Merge "Check feature before running test" into klp-modular-dev

* commit 'b12e199eba047cefcfb904d66e40e3b4866adc49':
  Check feature before running test