Merge "Fix USSD Api test app" into oc-dev am: 4c0a602ef2
am: 85821861eb  -s ours

Change-Id: I4d2895b22ab56433372c64c058bb57255bed1159