Merge "Add tests to verify UsageStats persistence." into rvc-dev am: 564efe22 am: fedabb1b am: ff9a0421 am: 05ef807d Change-Id: I3aaf9c0247420ea070cb3bf1b5d180c63786de43