[TIMOB-17174]Upgrade Analytics to use the new API.
Merge pull request #5835 from srahim/TIMOB-17174-33X

[TIMOB-17174]3_3_XUpgrade Analytics to use the new API.