Framework: Generic Blacklist support (4 of 5)

Change-Id: Id6c85c9a537713ec77d00deb7f7fe5a9150be2cd
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2