Merge "Move gki to packages/modules/Gki"