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

Change-Id: Ia91b71536447e65725a85ebf2ac4f411aebe86c8