Merge "Change string connected_via_network_scorer_default." into oc-dev
am: 3938580b86

Change-Id: If62e361cd59a8bb64bfdf585bbc50a7f4df640bd