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