fix according to comments
fix according to comments

changev/on-build-config,sunnyqianzhang/on-build-config,changev/on-build-config,sunnyqianzhang/on-build-config,changev/on-build-config,sunnyqianzhang/on-build-config