Merge pull request #1094 from asmorkalov:android_na_fix