Merge branch 'v3-official'
fix compile on ubuntu.
fix.
Merge pull request #8111 from joewan/v3

fix compile on ubuntu.