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

Change-Id: I808704bb7b95a350f3655a286dd0b6d6ba6ec871