Merge "configs: msmsteppe_au: enable gki"