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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I613e514ce8ad06cadfe633a142bb3ecb34c8cb4f