Remove entries that should not be in the blacklist. Partially reverts commit 00b23d3c. Test: m Change-Id: I658f31f1df299eb06fb353e8bba118470112d80b