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

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ie11223956b460c96dfcbe42ac51180d8f48fd364