... because the upcoming AutoInstall conversions introduce dependency
from FolderItem to auto-installed executables, and we want to ensure
that that keeps working.

Change-Id: I08d4aeddd28b93f080e201716597315e9a6ec2d6