Merge "init: add an initializer for keychord_id_" am: 7c3f147070 am: e2865c0f54 am: ea3434e0dd
am: 67dfc3e691

Change-Id: Ia6cba845dff02ef112eabcf8f0236e08b89167b8