blacklist is replaced with blocklist. Test: none Change-Id: I59f9fde5900b9aee82aca1eab4a6ded3d136063b