[automerger skipped] Merge "Add a lock to protect persistent stats snapshot"...
[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev am: ac8913be -s ours
am: a5b48c10 -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1 25243b4e is in history
Change-Id: Id3eca996369f20b684f2d3d0436a79288193c7b0