Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	mk.dependencies

Change-Id: I70d961e0c9c3ccbdf27c452b17d22c3548e3034c