Updated from global requirements

(Also add the sphinx issue which wasn't in the automatic job and
blocked this from landing.)

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