A few kk changes

Change-Id: I11066b9dd9a861f0dcef0755884b31a13a8ad52f
Stop a few things from building for now.

Change-Id: I8f1c3be3a735dfebc33e86d6635e7eead85a211b