Merge "Fix no uses-sdk tag default test" into sc-dev