Merge "Add a lock to protect persistent stats snapshot"
am: 84f5f1b8c4

Change-Id: I73851336452110afb74d6dd1ca5e50047d5b3d4a