Merge branch 'cm11.0-2.6.32' of https://github.com/Quarx2k/android_device_moto_jordan-common into PA-kk-2.6
Add safety net to ensure it works