[CLC-1813] Fix to get the build happy again
Merge pull request #1038 from yuhunglin/CLC-1813

[CLC-1813] Fix to get the build happy again