Cleaning up pip-requires

Change-Id: I0d287a9148347423329f786547eadce9c0e7545e
Fixing a couple copyright lines

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