Updated from global requirements

Change-Id: I421ab7a5b0c0224122cc747141956bc1282f2b07
Remove httpretty from test requirements

We don't use it...

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