Merge "Adding a code name version check until the SDK constant for K is set." into klp-dev