Merge "Fixing nullpointer exception when accessing StatsLogger before initialization" into tm-qpr-dev