Merge "Unable to boot SNDC pod without AAF"