4.3 detection fix

Change-Id: Ib5e3df51fa7a383f3699968e899e06d579480564
Merge remote-tracking branch 'github/cm-10.1' into cm-10.2
Merge remote-tracking branch 'github/cm-10.2' into cm-10.2