Merge "init: add keychords_test" am: 680bc0b6b5 am: aac3972dd3
am: 94d6035077

Change-Id: Ia19a455267f46beb603b6b24f7dbdc1125f33bb4