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

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ic0c33fdc8a3e9ef8f5146d833bd821e69e537743
Merge branch 'sgt7/cm-11.0'

Conflicts:
	res/values/cm_strings.xml