Merge "Lock access to PowerStatsLogger data" into tm-qpr-dev