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

Change-Id: Icc4aa979cdc2f9cfb17333d10239154495af2a63