Merge "init: turn keychords into a standalone class"
am: 420fe5fe90

Change-Id: I3c0b494743b2991b30a8a1751b8560142f3c28f1