Merge "Rename Service Side TrafficStats Cache" into main