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

Conflicts:
	envsetup.sh