updates for k34
Merge remote-tracking branch 'kf/cm-10.2-k34' into cm-10.2-k34
Merge remote-tracking branch 'origin/cm-10.2-k34' into cm-10.2-k34