am e24c7ce5: Merge "Fix timeout in BaseKeyListenerTest." into klp-modular-dev

* commit 'e24c7ce5a405742ddfd60e7efe7e1f2d9c8251f8':
  Fix timeout in BaseKeyListenerTest.