Merge "Removed false positives from the greylist." am: 5d33fe94e4
am: 5adc8fa3e0

Change-Id: Icae0f94ec7ed74a6597a758cb99acf946214060c