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

Change-Id: Ida418350dc90764d83e2084d63f6e03ae541df3f