Remove diamond operator for 1.6 compliance

GCP-10270

Reviewer : Chezka Arevalo