Restored UMP code from SAMMY Kernel and fixed lost/broken code.
Merge remote-tracking branch 'upstream/master-jelly-cm-aokp' into master-jelly-cm-aokp
Nightmare gov: Restored to a previous commit!