Merge "Expose SdkExtension in the system SDK"