Aso 20210421 fix android issue

Merged Sherry requested to merge aso_20210421_fixAndroidIssue into master

Merge request reports