Mihir | #1236 | Fixing false positive build distro stage pass