Merge "init: switch out keychord id with std::vector match of chords"
am: e6a878644c

Change-Id: I5dc7aeb47a5279d5fa1f91f33e43952888a8d126