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