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

Change-Id: Id6fdf7b130890c8050394035982932e829525583