Merge pull request #4540 from kumpera/android-changes-part1