Merge "init: refactor keychord for testing"
am: 16dd3582b7

Change-Id: I91303bb157aab0df7349c6af05a50f560a4ef1d1