Merge "Support GKI updates"