Merge pull request #620 from cataliniacob/master

Fix Android issue 58602