Merge commit '5cdfa272bfd19585560186e12eeeba2bef7a748f' into kitkat

Conflicts:
	services/java/com/android/server/pm/PackageManagerService.java

Change-Id: I98a1d2a1b1e7f69961f3c3c39073aedf4d5d1165