Adopt to changes in ApiBase/ ApiFormatBase

Needed after core change I04b1a3842.

Change-Id: Ibe98e62c26ecf9a31c9beea8b2ab7823e8b2ce73