Merge branch 'android-PATH' into release-3.20

Merge-request: !6528