fix samsung with token
Merge branch 'hotfix/1.8.11'