Sync with global-requirements

Change-Id: I9667fec2e11f2a8bf270052c1ac2063dfecb4e71
Merge "Sync with global-requirements"