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

Change-Id: I57040d3c94030b3c412b130c17f2df3ed926a98d