Snap for 8565712 from 18c1d56ce4db59e30b8658bb29f85c27b60ae5a6 to build-tools-release

Change-Id: Ibb6acb327f6d55eccc1342d8fa356040838f1716