Framework: Fix blacklist support

Copy & Paste isn't a good friend for programmers ;)

Change-Id: Ic6ab81462530f614b9e896cb098590241accb192
Merge "Framework: Fix blacklist support" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2