Updates: os exclusions for patches
(cherry-picked from f8b8641)
(cherry picked from commit e20e870)