Merge "Update network selection API"