Android OLD fix
Merge branch 'hotfix/Android_2.x'