Merge "Don't drop log about excessive O anomaly." into pi-dev