Merge "Cleaned up *-requirements.txt"