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

Conflicts:
	core/Makefile

Change-Id: Iaaab67bde70821f7add09f8ec823831b5cc84bb2