Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread