Merge "Selectively disable filtering if estimated safe" into oc-dev am: 38c97237e3
am: 14fe0b69c7

Change-Id: I9e75af1654188288d57653c754df56855eed5564