Merge "Aligned common GS Prometheus queries"