Update requirements due to global-requirements

Also fix small pep8 issue (missed whitespace).

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