Merge "[WifiScoreReport] Eliminate one name for 50" into pi-dev