Merge "Remove redundant caller check." into main