[TIMOB-16915] Only set the buildType if buildType has a value.