Update requirements due to global-requirements

Also fix small pep8 issue.

Change-Id: If308499aba0e408eb773fdf318d8af54896ba09f