Fix auto select for disks >= 12 and < 18

(cherry picked from commit 810d9945944a4bba3e8956ced8c41cefe445edc9)