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