Changes GA code for tracking cross-domain.

Change-Id: I731d6b160588b59f01abe98699c144fdf4ae12ad
Merge "Changes GA code for tracking cross-domain."