VID-1153 Update tracking fro GA to both