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

Change-Id: I0e73ba41b42062e4f318e7c0052af0d7abc08bea