Merge "Add SDK version check to skip S added API test"