* commit 'bb9a2035bd45c1b6d336044a9976be6fd1aaccbd': This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
* commit 'bb9a2035bd45c1b6d336044a9976be6fd1aaccbd': This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.