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

Change-Id: Ic35a5326c2a9be3024ad246a793e05221b2d7aca