Merge "Correct API change that was omitted due to checkapi failure" into 24D1-dev