Merge "Add uses-sdk to reduce red squigglies" into mnc-dev