Sync with global-requirements

Change-Id: Ia54203b80515d1cf68a14fd88e24bdacf1117aed