Updated Google Analytics code

Change-Id: I46d07c960421d18c172f8ae8404233c9e9aafc84
Closes: bug #1292460