Merge "Snap for 13196478 from 9c75fdc5f12965c98fe844fdb5f6c8b45974375f to build-tools-release" into build-tools-release