Snap for 7187819 from 5bf6ad8f591ea517ff4920a9fe4e014f082a7b18 to build-tools-release

Change-Id: I7c0d8329ef8defd7f801d1fddce873e3bc61c52c