allow on devices back to Android V7
backport complete
Merge branch 'master' into release-v1