Fix merge from android-4.3_r3.1

Change-Id: I8918574a6eb71502db1e79e3f1c862db715989d5
Merge branch 'cm-10.2' into martincz