Update blacklist to CM state

Change-Id: I5ebedf34b05721e9ead6d4b816ba145e7c749d7a