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

Change-Id: I2429527fddc0c8dc2714aca83df10e612215edaf