Merge tag 'android-4.4_r1.2' into cm-10.2

Android 4.4 Release 1.2

(cherry picked from commit dca60ffc911c89cb7e09af47747f29d31df84178)