Merge "Properly handle system app permissions."