[Android] Fix for JIRA issue VA-883.