Build fix following MOBSDK-554