Fix broken test (due to merge conflict).
Merge pull request #5867 from edx/mobile/fix-broken-master

Fix mobile_api broken test (due to merge conflict).