Merge "Correct API change that was omitted due to checkapi failure" into main