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

Change-Id: I3ef75aea36939b1dffa44500097709ef51787a1d