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

Change-Id: I3eb066cfb1cb9a05d79401dd15438afb6c7b9eae