[TIMOB-17231][TIMOB-17231][TIMOB-17232] Fixing issues with sending out analytics events.
Merge pull request #5872 from srahim/TIMOB-17231

[TIMOB-17231][TIMOB-17232] Fixing issues with sending out analytics events