Fix OS SI filters

Change-Id: Ie890cb62eda4366f6c2618d9f489841a12f2e57f