Enable version detection for 'advanced' variants

Change-Id: Ic5d2a46f7217c586b033ddbc2b4527ce6bfd1d50