Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	res/values/strings.xml

Change-Id: I742260ca91fdc77781216f29de1fd655e487b654