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

Conflicts:
	core/java/android/app/ApplicationPackageManager.java