Fix merge from android-4.3_r3.1

Change-Id: I8918574a6eb71502db1e79e3f1c862db715989d5
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2