Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev