Merge upstream

Change-Id: I1a32a9155652c77bc15f1f0bb9cf60aabdeaa9d9
Merge branch 'CyanogenMod-cm-11.0' into kitkat