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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I70dc3848bde59135e8dfe034be5dd745957d4344