Merge pull request #1170 from igorko/master

Android fixes