PRD-4818, PRD-4819 - Move SDK code into core to make OEM use cases easier