* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8': Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8': Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest