Bring in changes from CM branch cm-11.0 https://github.com/CyanogenMod/android_device_samsung_msm8960-common