Merge "Update testPermissionControllerDomain" into rvc-dev