Backport AA fix to 9.2 for install media