Update requirements due to global-requirements

Also fixed pep8 issues.

Change-Id: I9493f79de18f05e449d0f7d52d89a96e588235c6
Merge "Update requirements due to global-requirements"