These are redundant with the new ones in the settings app, and in some cases conflict with them (or just don't work). Change-Id: I8e03ae1d77c6dfadcd7fdfc80279b54a3f65e7df