Merge "Fix default name conflict" into build-tools