Fix the build break in two open source packages caused by check in 10660.