Added fix for locations    Ticket: GCP-9892    Reviewer: Aldrin