Fix the API build

In 28694a09c9c05dc7f74a5e15f6210bb69bf72aa0 a conflict in the merge
from stable-2.8 was not resolved properly and the API build was broken.

Add back the missing part to fix the build.

Change-Id: I2b0295212631ffad0ba4b57c77b5935b8200d384