Merge "HIC: Add report facility for overzealous anti-falsing" into nyc-mr1-dev