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

Conflicts:
	src/com/android/settings/cmstats/ReportingService.java

Change-Id: I809fe41a60f289d7303d54286cff942114d7a694