Merge "Create a test for GKI KMI compatibility"