Merge "configs: enable gki"