Merge "Fixed tests that were not properly mocking PackageManager." into sc-dev