Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev