Merge "SDK -> SDK_PACKAGE to address API feedback."