Manual merge from github.com:CyanogenMod/android_device_lge_g2-common into cm-11.0