Merge "Update GSI keys for dynamic system image"