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

Change-Id: Ice3fa43cfdd51f06b90c5834e92623b55f2f0e5e