minor Kryo related cleanup

Change-Id: I772fc1f776563d30f1a4081c6fddd5739d985263
18 files changed