Reverted Google Analystics commits

Change-Id: I28efc154c8326c2851192bab2b8a99332c4c2f18