Merge branch into cm-10.2

Android JB 4.3