Updated from global requirements

Conflicts:

        requirements.txt

Change-Id: I5493b94213e370fec2bb5f0b9d8f9ed4550a722d
Merge "Updated from global requirements"