Merge commit '8bc2495e5ee83d2815b3e7ed151271dae057db67' * commit '8bc2495e5ee83d2815b3e7ed151271dae057db67': Fix sdk build.