Sync with global-requirements

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