solve 2502_VOCAL_ANDROID
Merge branch 'feature-2502_VOCAL_ANDROID'