Merge "Do not use internal-API PermissionChecker"