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

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