Merge "[daisy] Fix the scenario in build-name"