Initial SCONS changes to support new kv api.