Add back blacklist settings.

Change-Id: Iae35717acfa9af4da75c07d24352acf981d19fc7
Add back increasing ring settings.

Change-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4