Merge "Remove "uses-sdk"."