Merge pull request #285 from bhariharan/sdk_componentization

Making the SDK Pluggable
Update to latest shared commit
Merge pull request #286 from bhariharan/unstable20

Update to latest shared commit