Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev