Merge "Remove tool provisioning in Standalone contexts"