Android hotfix for previous commits.