Merge "Update glide cache key" into sc-mainline-prod