Merge commit 'c51e279366ff7eed48d3256811381528692240d0' * commit 'c51e279366ff7eed48d3256811381528692240d0': Fix the SDK build.
Merge commit 'c51e279366ff7eed48d3256811381528692240d0' * commit 'c51e279366ff7eed48d3256811381528692240d0': Fix the SDK build.