We will already be specifying AuxiliaryKeyHandler as our keyhandler in overlay, so why don't we just do that by default? Change-Id: Ib39f3840b3a4babb453609c1bc93d59101196274