e2f1ee6
New upstream version 1.36.10. (cherry picked from commit 587af49355de6caea447c559663732de21186e15)