Merge "[Spa] Upgrade AGP to 8.2" into main