add keydisabler support

Change-Id: I4ff85c493d990a9d2249a82f7289fd76085c38ae