Merge "Slight relaxing of ContextUserIdChecker."