Merge pull request #4612 from kumpera/android-changes-part2