Merge "Remove unnecessary @IntraCoreApi annotation"