Merge "init: lock down access to keychord_device"