Cleaning up pip-requires

Change-Id: I0d287a9148347423329f786547eadce9c0e7545e
Merge "Cleaning up pip-requires"