Merge "Include dark greylist entries from annotations."
am: 50adb3213b

Change-Id: I076f48929056c8528b559dc3b73bcd10b71f54bf