Merge "Increase test coverage of AppStatsManager"