Merge "Remove SdkSelectionUtilsTest" into nyc-dev