Merge "Set API version for KKWT. DO NOT MERGE" into klp-modular-dev