Merge "init: refactor keychord for testing" am: 16dd3582b7 am: 334b4c843e
am: a12e94809c

Change-Id: If46d0eb0af07fb8c14cad71a8c90acbdd3e10675