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

* commit '96caf772508265bb31ae83534eec5ee6e1a77d78':
  Fix timeout in BaseKeyListenerTest.