False positives confuse and annoy users

Change-Id: Id8649b61cf07eb6a11878991a52614566bbceefa