Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048' * commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048': Fix SDK build error.
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048' * commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048': Fix SDK build error.