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