MOBSDK-708: Workaround for ACE-1445