Merge "Fix USSD Api test app" into oc-dev