Cherrypick the requirements.txt changes from commit e69bfd