Merge commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f' * commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f': Fix $#%^&%!! SDK build.
Merge commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f' * commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f': Fix $#%^&%!! SDK build.