Merge "Persist UsageStats before backup." into rvc-dev am: 75aeabdd8a

Change-Id: I7673eb5f267dba193b2ea63e500bb9f65c2ab520