* cherry-pick commit (a7883380ce) Co-Authored-By: Lucas Nascimento <keader.android@gmail.com>
a7883380ce