Merge "Merge "Selectively disable filtering if estimated safe" into oc-dev am: 38c97237e3 am: dfce81961d" into oc-dr1-dev-plus-aosp