Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	config/common_full.mk
Merge branch 'cm-10.2' into TheROM43