Merge "Snap for 8904083 from 79aa73858cf4199d48f722b3315c61654653b73b to build-tools-release" into build-tools-release