Merge "ApiBase: Remove deprecated getResultData()"