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

Change-Id: I03c489b1268581c2c1d2562fc908afafeeb9afb3