Merge branch 'cm' into HEAD

Conflicts:
	res/drawable-hdpi/ic_blacklist_calls_off.png
	res/drawable-hdpi/ic_blacklist_messages_off.png
	res/drawable-mdpi/ic_blacklist_calls_off.png
	res/drawable-mdpi/ic_blacklist_messages_off.png
	res/drawable-xhdpi/ic_blacklist_calls_off.png
	res/drawable-xhdpi/ic_blacklist_messages_off.png
	res/drawable-xxhdpi/ic_blacklist_calls_off.png
	res/drawable-xxhdpi/ic_blacklist_messages_off.png

Change-Id: If4282a6fed3507e7e6bc1f7f4e822b77df7c60fc