Merge "Update NetworkScoreService to use SystemService" into pi-dev