Merged with upstream master and disabled Jetifier. (cherry picked from commit 1ae52bd33f2f638640bcea4e059be9003499685e)