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

Change-Id: I29348c45f2c276525e1c22f5d05383d3fdd2de5c