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

Change-Id: I5458c733d28138e60411437bfa27dd4276315010